From 018bee64aab26f5d35aff6de760f8d7f27f4e57e Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Fri, 6 Oct 2017 00:36:01 +0100 Subject: [PATCH] HighContrastInverse: Make window borders visible They were hard-coded to a transparent black, but that is our bg colour in HC Inverse, so windows stacked on top of each other or a dark background blended together into a mush. Fix this by making the $_wm_border* colours relative to the fg colour, so that HighContrastInverse gets borders that are transparentised white. https://bugzilla.gnome.org/show_bug.cgi?id=788575 --- gtk/theme/HighContrast/_common.scss | 4 ++-- gtk/theme/HighContrast/gtk-contained-inverse.css | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index ac993545f1..00d79771fe 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -3286,8 +3286,8 @@ decoration { // this needs to be transparent // see bug #722563 - $_wm_border: transparentize(black, 0.77); - $_wm_border_backdrop: transparentize(black, 0.82); + $_wm_border: transparentize($fg_color, 0.77); + $_wm_border_backdrop: transparentize($fg_color, 0.82); box-shadow: 0 3px 9px 1px transparentize(black, 0.5), 0 0 0 1px $_wm_border; //doing borders with box-shadow diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css index 0d9c1218ca..5e6ac493a6 100644 --- a/gtk/theme/HighContrast/gtk-contained-inverse.css +++ b/gtk/theme/HighContrast/gtk-contained-inverse.css @@ -1469,17 +1469,17 @@ colorswatch#add-color-button:backdrop { border-width: 2px; border-style: solid; colorswatch#add-color-button overlay { border-width: 0; background: none; } /********************** Window Decorations * */ -decoration { border-radius: 7px 7px 0 0; border-width: 0px; box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.23); /* this is used for the resize cursor area */ margin: 10px; } +decoration { border-radius: 7px 7px 0 0; border-width: 0px; box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(255, 255, 255, 0.23); /* this is used for the resize cursor area */ margin: 10px; } -decoration:backdrop { box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 3px 9px 1px transparent, 0 0 0 1px rgba(0, 0, 0, 0.18); } +decoration:backdrop { box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 3px 9px 1px transparent, 0 0 0 1px rgba(255, 255, 255, 0.18); } .tiled decoration { border-radius: 0; } -.csd.popup decoration { border-radius: 0; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); } +.csd.popup decoration { border-radius: 0; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(255, 255, 255, 0.13); } tooltip.csd decoration { border-radius: 5px; box-shadow: none; } -messagedialog.csd decoration { border-radius: 7px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); } +messagedialog.csd decoration { border-radius: 7px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(255, 255, 255, 0.13); } .solid-csd decoration { border-radius: 0; margin: 4px; background-color: #000; border: solid 1px #737373; box-shadow: none; } -- 2.30.2